Fix minor problems caught by static checking.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 14 Aug 2011 06:08:07 +0000 (23:08 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 14 Aug 2011 06:08:07 +0000 (23:08 -0700)

Trivial merge